From c66aa6c1452954fbf3e52c629b54a294309536b8 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de>
Date: Wed, 1 Oct 2014 18:41:16 +0200
Subject: [PATCH] Use configure --includedir=DIR to set INCLUDEDIR

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
 config/Paths.mk.in | 1 +
 config/StdGNU.mk   | 1 -
 config/SunOS.mk    | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index a2221c84d7..2151c14b2f 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -33,6 +33,7 @@ SBINDIR                  := $(sbindir)
 BINDIR                   := $(bindir)
 LIBEXEC                  := @LIBEXEC@
 
+INCLUDEDIR               := $(includedir)
 SHAREDIR                 := @SHAREDIR@
 MANDIR                   := $(mandir)
 MAN1DIR                  := $(MANDIR)/man1
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index bcf02ea40d..b28a0777c1 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -28,7 +28,6 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-INCLUDEDIR = $(PREFIX)/include
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
 
diff --git a/config/SunOS.mk b/config/SunOS.mk
index c88fc2afb0..1eaf0f8fc3 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -20,7 +20,6 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-INCLUDEDIR = $(PREFIX)/include
 
 BOOT_DIR ?= /boot
 
-- 
2.30.2